Fixed constructor methods. Those need to be improved because it plain sucks now.