Some fixes for compressed source