Fixes for in class installations.