Quick fixes

Fix some issues after merging.