Some TODOs
Move workaround code to bottom