Bugfixes v3.0 

* Requirements issue fixes.