Fixed Catalyst, several other tweaks