Fixed a few Bedrock issues