Fixes for smaller build