Adds remaining fixes