Some fixes for css file-object mapping