Bugs fixed from status class