Fix call to non-existent method
Fix static paths
Add few minor changes