Resolving install problems and other fixes