Bedrock Fixes, small tweaks