General Fixes *DO NOT MERGE*
asscrack