Attempting fixes