Temporary fixes for a bigger issue