Fixed a few issues regarding compiler generated methods