Various splash fixes