Non-Laravel fixes